Revert revno 116055.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aaabe6ae87db6a9ca1ca93f2b71362488e2cc02b..ec41635d48300151e866a32ceb774258c46ee1ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2014-01-17  Bastien Guerry  <bzg@gnu.org>
-
-       * simple.el (define-alternatives): Fix docstring by advising
-       developers to (defvar COMMAND-alternatives).
-
 2014-01-17  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant.

diff --git a/lisp/simple.el b/lisp/simple.el
index e69cbbdfdc3220dd95475389853bc92a7db45872..ff32d204d170e8e96e988359853a97b1ce32940d 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7666,10 +7666,8 @@ Running `C-u M-x COMMAND RET' prompts again for an alternative
 and overwrites the previous choice.
 
 The variable `COMMAND-alternatives' contains an alist with
-alternative implementations of COMMAND.  Developers should
-use (defvar COMMAND-alternatives) to declare this variable
-after they write (define-alternatives COMMAND), otherwise
-the variable will not be handled by programs like etags.
+alternative implementations of COMMAND.  `define-alternatives'
+does not have any effect until this variable is set.
 
 CUSTOMIZATIONS, if non-nil, should be composed of alternating
 `defcustom' keywords and values to add to the declaration of